Refactoring Step  complete: moved methods to more adequate classes, removed unnecessary variables