Added multiple mbed support and conform to style