Small cleanups (trailing spaces, useless import or variables)