Cleanup (mainly style) of arduino code