Removed Comment, added variables