[settings] code cleanup