Refactor

Yayz