Change User to self in class method names
Add user instance variable for better integration testing