reorganized this large controller for readability
Merge pull request #48 from ChartKillers/kyle

reorganized this large controller for readability