fixed code review changes
like a boss