Changed response.setContentType in handlers; cleanup