Tighten names and comments for clarity