Cleanup from Josh suggestion.