EnderChest refactoring