simplified that.

i pushed the changes for the comments.