My first code refactoring