Code cleaning up for user data access