tidied target setup stuff