clean up variables and move logic to add_suits method