Changed name and tidy up