done in class, added Trim()