Code quality improvement batch #1 (import cleanup, missing braces, for-loops)