Adding style changes from @rnowm