Code review feedback was applied
Janek, Leo and Laura reviewed my code and I tried to apply all their feedback.