Little code refactoring, experimenting with Clean Code guidelines (TM)