Cleaned Math Helper, Modified Shapes.