Revert "Add new constructor"

This reverts commit 5cd30af213e9e462674784949a7ba84ba0f38fc9.
Add javadoc and a new constructor
Add javadoc, a new constructor and refactoring
Resolve conflicts