Fixed left handed bug and further class consolidation