Finished RF support implementation
cleanup / code formatting