Cleaned up some whitespace and bracket issues.