cleaned up how data is transferred throughout app