Rewritten initial JavaDoc and inline comments