Refactoring code
updating to reflect on GitHub