Clean up boilerplate
Add deck, player