Minor Modifications + Comments