renmae and cleanup code and output