I cleaned up a bit in all our classes.....