Replace ReadFull with Read and some cleanup