removed connect/disconnect behaviour as it's now a module; removed trailing spaces