Various cleanup and standardization