Fixing scope by removing fat arrow functions