some spacing cleanup