continued cleanup and consistency