Code Cleanup - Converted Code to New Style.