more refactoring
fixed a bug and removed unused methods
Merge pull request #13 from Apogaea/refacotring_shifts

Refacotring Shifts