Small alignment. Cosmetics
listeners reimplemented as decorator patterns