Cleaning up. Arithmetic functions are going into their own file.