Improving code, setting up new Platform system