Removed trailing whitespace as well as unused imports