cut out unnecessary use of Classes