Partially tidy User class

 * Fix poor call to apiQuery
 * Type hinting