Added ScalaCheck dependency and started refactoring, etc.