Yep looks good, unit tests would be best.