Improve code style slightly

* Allow inner class imports
* Try to follow 100-char right margin