Fixed subtraction and clean up
clean up