d3-2 clean up
Merge pull request #51 from camjohnson0302/layout-CLEANUP

d3-2 clean up