more style changes
clean up key creation