Little cleanup, started incorporating foundation