Organization and Optimization

Getting rid of extra code + minimizing what is there.