cleaning up and adding sample specs