Added example for ScalaCheck + some tidyups