Made changes after code review with mentor