Tiny maintenance changes made