Fixed issues in final code review