del conform and cosmetics
Merge pull request #4 from zn4ke/dev

del conform and cosmetics