a bit of cleanup and commenting