Minor tweeks

Better naming of methods etc.