Proper chunk read; Cleanup PR