Style changes, and version fix