tidy up for pyrf-0.4.0