Added "click to install"

also some code cleaning