Removed @ from variable names where not needed