Tidied up resultClass handling