Code is neater and some names have changed for the better