Modifications and re-organization of style