Cleanup Addition, started multiplication