TUCKER: Some more refactoring