Removing unecessary arithmetic