Fixed post code review issues