style fixes & new static nested helper class