Style changes and minor fixes