just a little cleaning to reduce code size and avoid some compiling problems in specific versions of gcc
