Aerogear 956 responder refactoring