Last minute style improvements