clean up and styling