Added useful section comments
Refactor init methods