-couple of IDE hinted cleanups: unused imports, position of [] in array declarations