Refactoring in several classes and methods, deleted unnecessary lines and comments