Cleanup code; update POD; update tests;