Try to make things more readable
Remove irrelevant comment
Refactor for readability