Fixed error in WCA constructor.
Minor cleanup of spaces.