Cleanup some one-liners
formatting