remove duplicate code
Removed duplicate code.
Removed no needed comments.