clean up codebase a little