constraints for pouring and filling added
refactored constraints to class, removed duplicates from resulting list