Cleaning up state types
Putting mixed precision into state package