Tidyup, use make for setup