Remove Comment out and Refine Code