Post

* Cleaunp class

See diff & comments