小規模なリファクタ

Special Thanks
  @hanachin
  @kimihito
  @tompng
  @naopontan
Merge branch 'refactor_model'