clean up and nest css