Code refactoring: KISS please.