Properly renamed some variable names to prepare for scaling