Cosmetic changes, minor refactoring and documentation/comments
Fixed issues with merge and update. Also some cosmetic changes, minor refactoring and documentation/comments
Some cosmetic changes, logging updates, minor refactoring and comments