Refactoring
Minor changes