Removed awesome ternary operator stuff and changed variable names