Reorganize and polish up styles