some cleanup and standardization