Refactored and added code