Variable names etc edited