More minor cleaning