Jeff Added trim()s