Changed angle algorithim
Changed angle names to better represent their function