misc neatening
misc neatening