cleanup and consistency changes