For Code Clean Up