Clean up the Normalizer class
Clean up the Serializable trait