Finalization, JavaDoc added