Comment and cleanup the code