Some minor cleaning