Made fixes from code review