Improved identifier naming and comments