Improve readability. More comments!