A bit of cleanup and formatting