Refactor some implementations