Random Stuff

Refactoring, and such