Ran maven whitespace cleanup and added missing imports