Ellipsis and code cleanup