minor: reformatting of recently changed code + use uint instead of unsigned int