Refactoring code
Minor rename