StartClient refactor
html comments + cleaning step 3