- refactored few classes