Refactor

• • •More