Updated key and removed some unnececssary code/comments.