Some minor cleaning up