Removed unecessary scoping