Fixed recommendations from code review