Tidied classes again!