Adding @jgwak suggestions.