refactoring under original modder name and removeing jd-gui comments