Amended methods

Refactor