Fixes User and reformats __call__