Scaladoc Fix
Removed duplication
Extracted methods for readability.
Some minor improvements
Applied scalariform
Merge pull request #1301 from tototoshi/refactoring-evolutions

Refactoring evolutions