First Code Cleanup