cleaning up and styling