lint and fix up styles