Starts making code review fixes