Uses better variable names
Fixes PHPDoc for User