Changes made based on PR feedback

Remove signal handling: not needed
@listener -> listener since we're only using it locally
brackets are initialise args for code style