Fix some minor programming style issues