Tidy up of Javadocs
Refactored LOCKMAP to lockMap
removed null initialisations from DataProxy