Cleaner solution for the parameters