refactoring to get the project ironed out