DAR-2629 | After CR: Add comments, fix variable's names, and fix small bug