Fix javadoc
Refactor systemProperty
Refactor UTF-8