Trailing Spaces Removed And Imports Imporved

The trailing spaces has been cleaned up and Imports have been Improved. No changes to the code :smile: