Class architecture refactoring. Code cleaning.