refactor and add FIXME line

Signed-off-by: Akira Hayakawa <ruby.wktk@gmail.com>