Add comments and use more meaningful names