Merge "Remove code smell and bug"