Added Setup file
Small clean up