Final Code Cleanup