Code cleanup; reduce indentation in loop()