Minor style changes
Bump version -> 2.0