generally cleaner formatting, just reordered stuff