Move into the mcfedr namespace, tidy up documentation and spelling of some variable names