Add comments, minor clean up