Refactored few things