Cleaned and updated to a new style