Refactored, Improved scaladoc