formatting
Updated after discussion on IRC