Some cleanup and adding getUserInfo