Improve internal commenting