Fix JavaDoc
use correct modifier order
use constants