Cleanups

@Gozala I left a couple of small things in the last few pulls which I am removing here, can you take a look when you have a chance?