Got rid of useless headerSize constant