Refactoring to use the one liner