Code Refactoring and added logo

Code Refactoring and added logo