Some formatting changes. New way faster version of Hatter.