Small (mostly style and var name) changes