Refactor to MVP.