I think one-lining this made it less readable but I'll let you decide.