Minor cleanups. Added comments.