Better prettify. Adding comments