cody style changes & fixes