Some refactoring. Added logging and Javadoc cmt

Rename class Data to TableData
suppress warnings