Connvention and style fixes