Cleanup ParametersBag + add input helper
Fix spaces in regex