some humble yet opinionated clean up