Clean up code and make it less complex/more organized

[snoorkwashanging]

Code, in general, could use some tidying up. We should go through, simplify, and organize everything more neatly.

[techie345]

Agreed. Although I'm planning on working on getting my logs fixed first even in their current state.