Refactoring

This is a test pull request to deal with hound ci.