Added minimal customization
Minor Refactor