Got rid of setup(), using constructor instead

got rid of the setup() method.