Finish project with little refactoring