Remove unused field
Remove unused define
Indentation
Replace pointer with const reference