My refactoring done