Random stuff, mostly making code more readable.