Comment clean up and code clean