General code cleanup for consistency

Found some cleanup while looking to add features and fix issues. Nothing drastic, just making the codebase a bit more consistent.