Removed needless comments and small code changes