more reorganizing and styling