Code cleanup, so it should work better on styles besides prosilver