Some slight cleanup for the basics