Cleanup
More efficient checks
Fix bug with name being too long
There can all be final too