basic cleanup. move addition/subtraction and mul/div into their own atom files