incorporated changes from my previous pull request minus the upstream merge...just my readability fixes now