Comments, imports and formatting (minor)