suit() and rank() methods

Using methods suit() and rank() everywhere for consistency