Solved code review comments