Code cleanup; new Class syntax