cleanup for -Wall & misc cosmetic