Small code changes (mostly style)