Minor clean-up including change tabs to 4x space