Chose better data to consider and initialized the corresponding
properties
Improved Javadoc