Moved the presence listener to a new class
Added a small comment
Moved some DI around