split up & clean up