refaactoring

removed whitespace on line end
moved imports to new lines