Minor refactoring, working on  tomorrow