Made Code Neat For Debug