Main class cleaned a bit