Apply @probablycorey's suggestions