Modularize and stylize