refactoring code, adding in Handle Bars