Cleanup, added Multiplication

HurrDurrage.