STYLE: Make previous patch cleaner