Added trim() to some parameters.