Style fixes
Version bump to 2.0.7