Remove nodoc and uneeded comments
Add some space