Refactoring, JavaDoc support added, mistakes in comments fixed