Revert "cleaned code, updated license"

This reverts commit f32d8e0cb1dc9d0578add80fc77311ef0a3078cd.