Tidy, update names
minimal javadocs