cleaned naming and formatting