added: some javadoc
code cleanup