Refactor lines as per hound