added more javadocs, removed unused import