made things more class-y