style and minor changes