Cleaned up indentation and other issues.