some tidy ups