a lil bit refactoring