Main class cleanup