Refactored
Minor changes