Changed some variable names for style