Nestor: added a little bit JavaDoc, FIXMEs, small performance motivated
refactoring