t3507: clean up style