Not overriding internal state.
Code style tweaks.