refactored to be on one line