first pass cleaning up styles