Refactor. Test Additions. General Cleanup.