Refactor User and PlanInfo
Add more specs :3