Implemented feedback from code review with @spinosa