Clean Code improvement