Clean up some residual stuff, add comment