Fixed all issues from code review. Code is clean