Refactored few files