Changes

Refactored code