Standardize on 2 spaces instead of tabs, reformat a little, (but not the external lib)