Cleaned up Box2d module and shapes