Addapted the rest of problem setup variables to the code styling