further reduced refactoring to one-liner