Cleaned up a method call...
Merge remote-tracking branch 'origin/master' into master1
More cleaning...