Some cleanup, Make calculator 4x4