Fixed CS. Polished javadoc.