cleanup
edited dependencies
clearer layout