Refactoring for Arduino sketch
Merge