some polish + simplifying eps