scaladoc
scaladoc & refactor convert.* method