Tidy up struct and previous object handling
Tidy up struct and previous object handling

smoogipoo/osu,peppy/osu,NeoAdonis/osu,peppy/osu,UselessToucan/osu,ppy/osu,ppy/osu,smoogipoo/osu,peppy/osu-new,UselessToucan/osu,peppy/osu,smoogipoo/osu,NeoAdonis/osu,ppy/osu,UselessToucan/osu,NeoAdonis/osu,smoogipooo/osu