Clean up rotation logic and remove unnecessary logic
Shape coordinates now only returns coordinates

Earlier it also returned the color of the shape which was incorrect
Replace string values with constants
Merge branch 'refactor'