Imports and some code style