Some cleanup and consistency changes