Removed unnecessary trim() calls