More tidying, changed access modifiers to be more consistent with rest
of codebase.