Standardize on some things, remove bad implementations