Removed nested header class and added some consts