Remove extra end
whitespace
Override only params we need