style changes
make generic