Code Cleanup

Better.