A bit of cleanup (incl method docs)