Clearer class structure