Refactored neat into its own struct.
Merge branch 'rewrite'

* rewrite:
  Refactored neat into its own struct.