beautified, some contant and LICENSE
refactorings