Formatting again, but better