cleaned code
added javadoc
renamed attributes
added javadoc
changed constructor