Refactor/platforms