Comments updated and commented code removed.