tiny refact. #2