Random refactoring

Just a tiny bit of code cleanup. Some changes are a bit subjective to the programmer (most notably the tabs) so feel free to modify.