Fix styling and remove unused params