Final clean up for code review