clean up minor code smells.