style structure changes for attempted bug fix