Refactoring

This is a test pull request to deal with hound ci.
Line is too long. [110/80]