General cleanup. Improve tabbing and readability.