Refactored few classes.