Improve readability. More comments