Issue 1 - extracted reused snippet to getDefaultValue function