Extra spaces weren't being removed with removeClass - but I haven't found a good...