more gooder formatting