Cleanup and indicate only string values allowed as params