Clean up

Mainly clean up of incorrect tabbing.