This is my tidyup of the Classes