Updating with @roustem's suggestions.