Removed default values for non-required variables and cleaned up the code for #4032