fix a few minor code smells