Cleaned up indentation, whitespace, and imports.
added missing copyright headers