Some cleanup.

Cleaned up code and removed unneded comment.