Daria commentary & clean up