Refactoring & javadoc
Javadoc & small refactoring
You can now delete entities from memory after they are unused