More docs and cleanup (No functional changes)