refactored platforms
small refactorings