Cleanup of comments
Adding content