Some minor updates. Commented code was deleted