Minor cleanups. link

axel22 authored to master