Refactor code project