[Cleanup/Bug Fix/Update] Cleanup some code to make it more readable./Possible fix for NPE onJoin./Update Vault dependency.