The commit that made everything tidy and neat!