Clean Up

Cleaned up code from last year so it can be examined for reference for this year's auto shift project. More readable.