Move method in correct scope