Cleanup; code formatting to improve readability.