Make codebase a little bit more readable