Incorperated @brannondorsey's Edits

Improvements from the awesome suggestions by @brannondorsey