Improve readability, comments