did some code refactoring in et.ino