Assessment 0 refactoring