Adding comments
Improving indentation and structure