Fix indentation and cleanup.