Apply @matthewd suggestions