small refactor for legibility and improvement of comments