cleanup and introducing math operations