Many cosmetic modifications to eliminate warning message from GCC version
4.6 compiler, mostly due to unused variables.