Fix, Refactor