Apply suggestions by Jerome