Refactoring

Pretty view and added comments