Added some improvements to formatter of the code and to the imports.