fixed stupid variable names