use regular singleton style;

try to fix source service crash, so …
- remove ‘;’
- remove single lines (set/get, if … ) as possible.