strict -Wall -Werror patching up
code cleanup