Integrate some changes and cleanups Co-Authored-By: Alexey <110727638+ZavaruKitsu@users.noreply.github.com>