IvanR/CannaW - Removed spaces