Class Clean up and Value Style Additon