Clean up code

Signed-off-by: Kaoru Ishikura <ishikura@sakura-creative.com>