Refactor 0.2