Cleaned up some confusing things