Client name feature added + some small refactoring