DDF-236: Better use of constants and moved factories to member variables, as per code review