Address additional comments

Addressed additional comments by @smizell @fosrias and @kylef