refactoring and adding logo