normalizing stuff, tired of cherry picking commits.