tidy up setup so its readable