[#11] applied DRY in constructor