Minor Refactoring v0.2
Minor Refactoring v0.3