fix/cleanup foundation setup

re-integrate normalize