Neatening this all up.