Removed currying (unnecessary for any components now) and plotting
function lines (redundant from the beginning).