trying to cleanup the codebase a little