Clean + fix style modularity