Remove some cruft and format nicer