changed copyright to the proper company name
minor whitespace and import order cleanups