Improved the problem setup code style