v1.0.x: remove listen() method
v1.0.x: minor refactor