Removed commented code. Updated comments.