Move things around, increase memory efficiency, correct things, move private variable to header