Readability changes, added comment