More clear code and disconnect