some cleanup, more good format