Further documentation / style cleanups