REFACTOR - minor cleanup