HG-63 some style cleanup