:shower: cleanup and :art: styling improvements