Minor: code cleanup