Eluna Moving methods and removing null checks