Minor updates - better names, docs etc.