refactoring. trying to make sure that fields are trimmed of whitespace.