Switching to one "circular" array for all assets
Removed unnecessary variables