Nestor: JavaDoc, FIXMEs, performance motivated refactoring