Comments and refactorizations :D