style fixes and token api change