Cleanup, doc comments