Fixed style and reuse of classes.