Code cleanup
Added prefetch