style changes; 14/17 tested