Small cleanup on 22