refactor

@DQNEO 
レビューをお願い致します。

That's true. I think you are right.