changing code to meet conventions per JT suggestion