Code refactoring (-16 loc)