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

del conform and cosmetics