More standardization and cleanup