Fixing short name
Removing extra variables for now