* improve style modularity