Refactoring
Refactoring tests
Cleanup, links, and final classes
Check for valid length