Improved comments and names