Removed old code
Removed irrelevant comment
Tweaks