small refactoring
#105 forgot to call listen(), should work now
layout