updated formatting, not a whole lot of changes