improve clarity and comments