Cleanup
Improved length evaluation, got rid of significance