Again reorganized to look proper in Github editor