Polish the codebase a little bit