Use radians for angles
Refactor and cleanup