Refactor takkanm and mayosuke