Adds minor changes after code review