Don't request over 16KB per piece
Code cleanup