Minor: cleaning up