cleanup and refactored to move to net.wpitchoune package