Refactor, change method name