better block based cleanup names
minor reformatting for better readability