cleaning up
+ some doc