Minor cleanup and consistency update