Restyling #2