Rearrange code in a not so web way
Finish poker scorer