Cleaning up and added section comments