commit 11, improvment listener, clean code