Improve code style
Update JavaDoc