Reduce indentation.
Remove commented out functions.