tidy up for component