Readability refactor + clearer comments