Code & JavaDoc cleanup