Refactoring 'functions' method.
Delete a TODO and add new TODO.
Tweak.
Merge pull request #18 from huyu398/refactoring

関数メソッドのリファクタリング