little mainClass cleanup