Clearer comments/var naming