bit of project refactoring