final style fixes for now