Changed name and style
Clean up