Misc cleanup; Angle arithmetic