Updates based on feedback plus some style fixes