Clean ups, consolidated functions, modified arithmetic syntax