no functional changes, just cleanup of pod and re-order methods