removes some dead or unused code
tidys up the logic a bit for better readability
Merge pull request #3 from Community-Christian-Academy/The-Branch-of-Diddles-slightImprovements

Suggestions