Now possible to use multiple platforms simultaneously
Minor cleanup