Fix extra space bug. Complete.