Code Cleanup

Performed extra code cleanup!