cleaning up codebase a little