Minor: cleanup