Refactoring: optimized imports, resolved some problems after code inspection(problems, that are not resolved now, will be automatically resolved after merge).