Improved comments and naming.