Assorted refactoring

Just cleaning up a few things that bugged me. Methods longer than one line really do annoy me these days.