Updated Javadoc and removed unused constructor