Reduce memory footprint

Hi all

This MR reduces the memory footprint a bit. Since I have not seen any use of uint*_t I am not sure if this of the same style.

Cheers, Stefan