Just some general suggestions for code cleanup

I don't like that this is being set in this method.  Seems like this should be extracted.