Cleaned up some confusing code.