Code Clean Up P1 Fixed