formatting/style improvements

formatting/style improvements