Few tidy ups