Clean up
Make Period completely self-contained
Fixes and cleanup