refactoring, movign things around