tidied one liners via Sam S contributions