style modularize

2 jobs for master in 57 seconds (queued for 16 seconds)