Various change
Indentation and styling. Remove old code