Final commit and code review