Minor cleanup of comments and accessibility