More cleanup and tidy