Remove useless inline scope parameter
Factoring conditional checker method
Merge origin/master