Add commented improvements