updated formatting etc