Style update
Merge https://github.com/addahlbe/InstantDevelopment