Refactoring, delete not needed includes, fix code style