Style changes from Onsi & friends