Cleaned style to wait for redesign