Minor docs and code cleanup