Updated scope, fixed style