formatting and update assignment

to use newer rsatools helper class