Cleaned up some commented code and tuned slightly.