Cleaning up the angle method