make imports explicit and fix code style